Removing legacy crud.