Fixes for mobile - removing cruft