Removed more adobe code, added dictionary class.