Trimmed down some sections