Remove dependency on atom in chandler