Removing old FType’s and patching possible NPE