Cleaning up files in extension
Merge pull request #4135 from timvandermeij/cleanup-extension

Cleaning up files in extension