Removed a bunch of commented out things that we will not need any more.