added cleanUpFp