Removed excessively commented obsolete code