Trimmed more unnecessary functionality.
Trimmed more unnecessary functionality.