Cleanup, check -- in quotes