Remove separate date class