removing unnecessary .all