More cleaning up in the angular app