Removed obsolete commented out code