Fixed: Removed bogus, redundant definitions.