Deleting a lot of old convoluted code.