Cleanup of build with some options
Authored by: artyom-beilis 2012-01-11
Parent: [r2061]
Child: [r2063]
