FIXUP Remove unused methods