Removed some defs