Attempt to fix deleteItem by moving it up in code? Other then that final push at  refactoring code.