Removing old inheritance stuff; we use filters now
Finishing removing inheritance stuff