Remotify the modifications
Remove unneeded tests...