Remove quit messages and replace with Close calls.