Removed Commented out code