More stuff consolidated (continuing removal of overkill configuration)