Controllers now use hook friendly remove