Cleanup
First attempt for multiple task support