separated the consumer client build vairables to the 'buildconfig.inc' file and removed unused code and files