Final round of cleanup - bare minimum needed