Remove unused import
Disable orphaned instances warning