Removed referential integrity code. Moved embed templatetag into core. Differentiated...