removed dead code, and un-needed logger calls for debuging.