Remove support for date