Some cleaning.
Merge remote-tracking branch 'origin/master'
Replaced removeExtension for files with a local implementation to avoid unnecessary library dependencies.