Cleanup, everything working