Removing trash links and fixing master