major cleanup in stupid commit