Make sure time is logged and clean up imports