Reomved some logging & tidied up.