Clean up application
Clean up more