removing some commented code
Add support for name spinner