More removal of mobile org stuff