Removed unused action
Updated messages
Fixed wrong import
Fixed issue in import function