Cleaning up for performance