removed unused import, deleted outcommented lines