More movement toward a simpler code base