OZF-171: Merging Profile logic and removing redundant classes
OZF-171: Removing Avatar