Remove watch, unnecessary functions and rename variable
Merge pull request #62 from pass-by-value/remove_watch

Remove watch and unnecessary controller function