c2de39de8b
They've been integrated with the rest of things. Move them to better indicate that. Also, delete some dead code that was noticed while updating the docs. Change-Id: Ie92c3d74edc08d62aa2bd55da689a400740bab6e