Removed unused import. Added delete/Close TODO's