Removed old builder and replaced all occurrences with the new one.