cleanup of project, simplify through baseactivity