more cleanup/housekeeping!

(removing duplicate/un-neccessary tasks, etc)