cleanup after refactorings, cs fixes