Removed some unused defines in Hypo
Removed some unused defines in Hypo