removed convenience definitions