Revert "Updates for v0.5"

This reverts commit cc34c1204c49b6be58eaadd361b15aca7de27deb.
Update