Remove dead code and reorganize a little
Use in-set now that it's typed