more cleanups
remove gametic
more cleanups