Removed leftovers before abstract base definitions