Revert "Update to code clean-up 1"

This reverts commit 579042f1483b441f7dfb037e2183e59b3ce93c25.
Revert "Code clean-up in in kart_properties and kart_properties_manger"

This reverts commit 12a39e2ed7aabfb2003af69cfcc626048b4bb55a.