cleanup everything, first beta working