Cleanup

Removed unused code and abstraction layers.