Minor changes.
Removes unused code.
Removes unused code.
Updates select.