Refactoring - removed one of builders.