code cleanup

getting rid of some unused functions, just general code cleanup