Remove duplicate EntityContainer class