Complete TODO items for avoiding injection attempts