Clean up + quit removed