Cleaned mj7 stuff