remove redundand del()s
enclose work in functions
remove debugging lines
Merge commit '417c' into culttag-redux