strip out some old logic, still not really usable