Fix for MacOS and remove extraneous files