remove stuff that should only exist on astrodroid-wip branch