Merge "remove previous pod suite yamls to avoid confusion"