Trimmed down on some things