removing custom $watch-ers to improve performance