First clean up

deleted some unused functions