Small refactorings like removing unused objects and code