A little cleanup, removing a lot of commented out