Cleanup on app code