Remove unused code for nil description
Add work map