Cleanup in preparation for deploy
Updated for mobile support