adding remFromAngular and making addToAngular more robust