Remove lots of old code
Work on switching to compositor implementation

Removing a lot of old code and cleaing things up.