Cleanup to start rework for version 0.3