Remove angular dependencies and merge remote branch