Removed simulator support