cleaning up for mobile readiness