parser cleanup and setWeight scaling removal