Code clean up and removed extra logging from my last commit.