Remove much old crap that is too complicated