Trim things down a bit