Removed extra/unused lines

Removed extra and unused rules
Limited date to just date[@when] and notBefore or notAfter