Cleaned up tree and removed extra fields.