Added rules & sane cleanup