Task/cleanup3

More cleanup
no idea