remove unused code / refactorings