Cleans up select list class heirarchy