Cleaning up app level code