MC testing done, cleaning up