Remove unnecessary code :scissors: