minor code cleanup

removing some testing code and comments