Removing builder references. Closes #5