EYETRACKER-112: Clean up factories