Improved the rules, added the cleanup_all rake task