Extra integer division prevention - patch by skoe@directbox.com (thanks\!)
Remove unused imports