DRY
removed old cruft