Removing deprecated; consolidating generators