Remove un-necessary guards.