Removing deprecated stuff.