Further c++-code cleanup