Remove unnecessary class function