remove unused define and make better use of current defines
remove unused define and make better use of current defines

vagrantc/libsoc,jackmitch/libsoc,yegorich/libsoc,hlummis/libsoc,janick/libsoc,hlummis/libsoc,vagrantc/libsoc,vagrantc/libsoc,yegorich/libsoc,jackmitch/libsoc,hlummis/libsoc,janick/libsoc,hlummis/libsoc,yegorich/libsoc,janick/libsoc,jackmitch/libsoc,janick/libsoc