Remove hardcoded dates