Removing old v1.0 stuff.