uber ultimate cleanup!