There appears to be a lot of commented out code in here, can this just be removed?