Updates docs and removes redundant code