[BACKLOG-290] Clean up extensions
Merge pull request #1952 from scottyaslan/devBranch

[BACKLOG-290] Clean up extensions