Continuing to work on removing types.