Remove unused code & Add work entries