Also kill superflous function and test. Is this a candidate for its own file?
Attach a file by drag & drop or click to upload