Updated docs and removed a redundant handler