more cleaing up, to help with clean up tasks (ha!)