1st cleanup
+ mobile cleanup