Removed remaining resize dependency entries and reduced the number of  calls.