Update docs, Remove the redundant code