Remove extra consts