cleanup
moved out NSDate+extra