cleanup some old evil stuff