Fixed rule deletion

And found more stuff to delete.