Removed useless factory class