Removed the plan selection
Implemented JENKINS-25593