WIP: Update build target for Mac
WIP: Remove unused files