Cleanup cmake/spec infrastructure