Remove the dependency on {{user}}