remove unused define and make better use of current defines