cleanup wrt upstream