Code update, unused imports has been removed