remove uneeded code - refs #37
all includes at the top for clarity
put string directly as rvalue to avoid copy with c++11
early return for features lacking geometries