WIP cleaning things out for new version