Remove rank controller again, happened to be added because of a stashed change