Some clean up in the membercounter module