Trimming some stuff down