#36 IntImpl cleanup