Removed some unused code
Merge branch 'master' of github.com:woothemes/woocommerce