Update to 3.6 and cleaning
Following KCP standards