Remove duplicated extensions code
Merge pull request #275 from eko/fix

Remove duplicated extensions code