Enhancement: remove redundant check