remove shifty. will use a new one in next commit