remove Set, List, Map classes

Testing build first.
I also prefer well-formatted code for this entire method.