Comment clean up; remove unnecessary function