Cleanup and speed boost