more mobile cleanup