Remove now unused code
Add new file to mac build