made enhancements recommended by Sampriti for PR
Some other minor clean-up... i.e. removed code that wasn't used or didn't do anything, related to time