removed useless refactorizations