Old commented code removed. Messy if {} cleanup