Removed obsolete commented code