Clean Up PCS and merge with rdc framework