Removed naive sys junk