Fix date methods and remove debug