Cleanup and add Rabbit.xml