Remove some duplicated code

Remove some duplicated code created during previous merge, they told me at ChefConf no pull request is too simple. ^__^