Types cleanup