Removed compatibility code