Clean up and fix overclock code