removed redundant commented code