Removed unused vars
Updated OSX project