Refactor: remove unneccesary code
Added Phone and Email and related entities