cleaning up old variables
removed date calculation
removed date options