Remove builders, it was not readable enough