Move basket reset code into a concern