Move logic to convert aware datetime to naive into function

Move logic to convert aware datetime to naive into function #373