major cleanup!