cleanup, old badly named exes
readd okay exes