Cleanup AppOps code,remove redundant code causing FC