Fix indentation
Cleanup API routes
Cleanup imports
Remove dump app2