Some clean up in common module