Remove redundant code More Hugs User