removed stuff not belonging to master