Minor refactor

Removed orphaned interfaces