clean up getting of times undid some speed improvs