Remove workarounds for missing c++14 features

Also some minor cleanups