warnings fixed
global define removed (not used)