Removed obsolete code; revert temporary commented out code