refactorings - get ready for no completion related new features