WIP: Drop un-used variable, un-used resolution