Removed older commented out code