cleanup(): removed unneeded ifs change