Removed builders everywhere