Remove unnecessary condition & visibility assignment