Clean up code

Also delete several unrelated, lingering files
that are leftover from making the app-template folder