cleanup and everything working