cleaned out some unused functions