Task/cleanup3

More cleanup
Same here... or I am not seeing something here...