Remove old, commented out version

New system good, old system bad