Removing commented out code that is not necessary