Cleanup, fixes for re-declarig angular modules accidentally