Removed horrible date fixes