3993 Fix some quotes and remove something we no longer use