Some more ep removals in mobile project (still has errors to be corrected)