Removing expensive finder call