Cleanups 2019

Go top