Update docs + Cleanup