Removing unused files
Fixing build error when compiling for Mac OS X
Fixing some compiler warnings when compiling for Mac OS X