Clean up quotes, get rid of logging