Update build number, clean up commented out code