removed some unused functions