Removed all factory pattern like code