#514 Remove those if-statements