Cleanup code for v0.1