Remove CM PIE Control (2/2)

Change-Id: If8f596dcf876781e52a2f50b000526257fdb7a3f