Remove lingering classes, update functions