Remove DRAFT stuff (moved to separate branch).