Clean up tasks; closing #83