removed unneccesary factory