Cleaning up application code