Cleanup unnecessary evaluation