Major FPS boost & cleanup