removed obsolete defines