Cleaned up inherent actions

Removed handling via inheritance