[fix] Remove the need for finds