Update docs and cleanup