Some clean up

Ripped out the shitty abstract class, I think it is not playing nice
with ReactiveUI