Clean up more egg leftovers