removed "unnecessary" defines