Updated function names in google controller, removed unnecessary functions in all controllers