remove unnecessary conditional