dead code removal
change model -> factory