Round 1 of cleanup