Cleanup mikep7 modifications