Hi, can this be cleaned up? Thanks!
Done
*** This bug has been marked as a duplicate of bug 740960 ***