Get rid of Locker class