Clean up misc rules in grammar