Remove watch and unnecessary controller function