Removed unnecessary slot matches and found places to use modify over retract