Develop/karos

please remove commented code