major cleanup and getting rid of shit