cleanups after seeing this old code doing silly things