Remove old function declaration
Use end date