cleaned out all old functions