Cyborg cleanup, fix.