CONN-1305 Removed Entity Proxy classes. Added TODO Statements.