Clean up defaults