Cleanup, unused code
Unused
Started cleanup