[REFACTORING]
removes unsused stuff