Removing commented out code that is not longer needed