Next stage in cleanup, seems to be less wins than before