Cleanups 2018

Go top