remove unused classes
defriendify classes
removed "todo remove me"