cleanup commonality setup