removing FIXME statements