Removed commented out code, updated docs