Removed trivial superclass
Added cascade deletion to foreign keys