removing old entity
refactoring
refactoring - pivot