track actually good
cleanups