ugprade cleanup