Removed To Do Label + cleanup