Agree with the posts above. It's tough to throw Mauer back into the draft, but unless Johnson's shoulder injury is going to carry over to next year and beyond (possible), I don't know who else you can swap out for him. Maybe Crawful. Definitely don't keep Melke.