Remove useless code, TODOs and improve some messages
Remove UTC proxy hack as it shouldn't be in the repo