get rid of FP use where it is unneeded