Complete removal of FCDPP macro