Remove overkill