Fix OSX 10.9 compile

Fix Makefile, remove remove_empty