Trying to trim down the bloat.