More restructuring, should start with removing unused code by the miner