Cleanup
added combo box just for looks