performance overhaul cleanup