Task/cleanup3

More cleanup