WIP
Cleanup, comment unused code.