Removed a lot of update stuff

Cleaned the function for update to just incorporate the most necessary.