dropped custom api component classes, it was always overkill and confusing.