cleanup

kicked out some unused functions/lines