(cleanup) Remove irrelevant commented code