Cleaning up files as last commit seemed to miss a few changes
Same