v0.3 cleanup
Revert "v0.3 cleanup"

This reverts commit 2e46b958db9096d9659f63a46d5127cc384d17df.