Removed an unused import, old comments, etc.