nanny: Remove statedir when nanny is not in use
Merge pull request #356 from pwieczorkiewicz/remove_statedir