Removed old definitions for end scope