cleanup from diff