Cleaned up defaults module