simplified/reorganized
removed old items