Some cleanup

Commented out hash map and list2 stuff. Case "Random": was missing from
sort, so added that.