cleanups in Goaloverview