Removed old, commented code