Remove overengineering, part 1/many