Removed commented code, updated docs