Initial clean up of individuals list
Removed commented out code
Merge branch 'individuals-list'
Removed commented out code