Remove unfinished stuff...

...might come back later :)