overdue overhaul

cleaned up and pruned