Clean up and icinga upgrade