Remove duplicates of import code in pluggable code