Cleanup usage of goop