Removed old compatibility code