Remove redundant code, thanks to @appden & @icodestuff