Cleanup collection and bit. Remove some more custom Entity fields
in favor of using the .data dictionary.