Cleanup

Cleanup, removal of old code.