Cmake

These changes remove dead fire solves issues #7 and #5