Removes non standard builder usage