Some cleanups.
Removed custom builder.
Some additional preferences.