Removed unused import and some compilation problem