clean up stuff
Tasks not working correctly...

Need help and to discuss further...