tbd: remove classes
merged with master