Removed redundant commented code