Clean up of Scribe functionality