Refactor3 - Remove interfaces

fixes #241