[refactor] dont do unnecessary lookups and cleanup logic