Remove old unported code
Remove deprecated size
Better variable name