cleanup fixes everything working till ~here