2014-06-16: Cleanup: builder