remove more old complicated crap