Refactor some more old solutions