removed some redundant logic (will be implemented in wiz.js module)