Remove redundant methods from generic
Remove itypes
Checkpoint