Raven lib clean up