Cleanup and Angular setup