[ To Delete ] Fix remove contr