Task/cleanup3

More cleanup
and one more here... really weird...