Wizard Fixes

Removed duplicate & conditions