Add back datetime, remove unnecessary kwarg