Complete v486 cleanup

Remove old files