cleanups: removed sapply or added fixme