Small refactorings
Cleanup after remove to seperate repository