major mobile cleanup code cleanup in general