Removed old, commented definitions