Perhaps it would be best to remove just those traits that are problem and make progress down the GoodCommander path much harder...