Fix for remove from watch list and organized imports.