Remove old server/client and try to make pi-worthy again