Remove dependency from ticket/23